Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 6 Sep 2010 06:05:40 +0000 (06:05 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 6 Sep 2010 06:05:40 +0000 (06:05 +0000)

Trivial merge